Fix bug reported by Mikael Hermansson with patch from Mikael (if there was

2001-02-03  Havoc Pennington  <hp@pobox.com>

	* gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
	Mikael Hermansson with patch from Mikael (if there was a toggle
	start one after the first character in the range, this function
	was broken). Bug #50380

diff --git a/ChangeLog b/ChangeLog
index 734d9f37067533b548438d4076738b9afc003730..e50a038055fe9f1264b301ac548a9243747f6a39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
+       Mikael Hermansson with patch from Mikael (if there was a toggle
+       start one after the first character in the range, this function
+       was broken). Bug #50380
+
 Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Remove confusing comment about X11.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 734d9f37067533b548438d4076738b9afc003730..e50a038055fe9f1264b301ac548a9243747f6a39 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
+       Mikael Hermansson with patch from Mikael (if there was a toggle
+       start one after the first character in the range, this function
+       was broken). Bug #50380
+
 Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Remove confusing comment about X11.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 734d9f37067533b548438d4076738b9afc003730..e50a038055fe9f1264b301ac548a9243747f6a39 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
+       Mikael Hermansson with patch from Mikael (if there was a toggle
+       start one after the first character in the range, this function
+       was broken). Bug #50380
+
 Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Remove confusing comment about X11.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 734d9f37067533b548438d4076738b9afc003730..e50a038055fe9f1264b301ac548a9243747f6a39 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
+       Mikael Hermansson with patch from Mikael (if there was a toggle
+       start one after the first character in the range, this function
+       was broken). Bug #50380
+
 Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Remove confusing comment about X11.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 734d9f37067533b548438d4076738b9afc003730..e50a038055fe9f1264b301ac548a9243747f6a39 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
+       Mikael Hermansson with patch from Mikael (if there was a toggle
+       start one after the first character in the range, this function
+       was broken). Bug #50380
+
 Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Remove confusing comment about X11.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 734d9f37067533b548438d4076738b9afc003730..e50a038055fe9f1264b301ac548a9243747f6a39 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
+       Mikael Hermansson with patch from Mikael (if there was a toggle
+       start one after the first character in the range, this function
+       was broken). Bug #50380
+
 Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Remove confusing comment about X11.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 734d9f37067533b548438d4076738b9afc003730..e50a038055fe9f1264b301ac548a9243747f6a39 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-02-03  Havoc Pennington  <hp@pobox.com>
+
+       * gtk/gtktextbtree.c (_gtk_text_btree_tag): Fix bug reported by
+       Mikael Hermansson with patch from Mikael (if there was a toggle
+       start one after the first character in the range, this function
+       was broken). Bug #50380
+
 Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in: Remove confusing comment about X11.

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index db30bd9b5ce90641faf3f62600c5e303864d8dcd..d6bd9bca991eea14d80332b4a311065882ecb087 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -1606,8 +1606,11 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig,
      with the tree. */
   stack = iter_stack_new ();
   iter = start;
-  /* We don't want to delete a toggle that's at the start iterator. */
-  gtk_text_iter_forward_char (&iter);
+
+  /* forward_to_tag_toggle() skips a toggle at the start iterator,
+   * which is deliberate - we don't want to delete a toggle at the
+   * start.
+   */
   while (gtk_text_iter_forward_to_tag_toggle (&iter, tag))
     {
       if (gtk_text_iter_compare (&iter, &end) >= 0)